auto merge of #528 : alexcrichton/cargo/deadlock, r=brson
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 02:13:47 +0000 (02:13 +0000)
commit444dc1e28e7cfc19500f8f98aa49e426ec9067fd
tree4e860af15b8078516698556457380a212b11807a
parent763e216907e65eda5b8f0e529ae175e881a9ae98
parentac094e893bf94d7d6d267abaedfa89bbb60e9ed6
auto merge of #528 : alexcrichton/cargo/deadlock, r=brson
src/cargo/ops/cargo_rustc/mod.rs
tests/test_cargo_compile.rs